Revert "st: Only use clutter_actor_invalidate_paint_volume() if the API exists"

Since we are past the 40 API change hurdle, it is safe to revert this
commit.

This reverts commit 1cefd589da2edca84d19b285d553e2a68cda3e37.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2010>
(cherry picked from commit ff4ff66498ec374fce5b22b8bc01b523d1304e0b)

diff --git a/meson.build b/meson.build
index 0abe4cffe74e197dbb90e27decb796e3ed99c49e..aa1ef271bbd1f0ebc64b83e29e5e77cd988d9a32 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -81,7 +81,6 @@ gi_dep = dependency('gobject-introspection-1.0', version: gi_req)
 gio_dep = dependency('gio-2.0', version: gio_req)
 gio_unix_dep = dependency('gio-unix-2.0', version: gio_req)
 gjs_dep = dependency('gjs-1.0', version: gjs_req)
-gmodule_dep = dependency('gmodule-2.0')
 gtk_dep = dependency('gtk+-3.0', version: gtk_req)
 libxml_dep = dependency('libxml-2.0')
 clutter_dep = dependency(clutter_pc, version: mutter_req)

diff --git a/src/st/meson.build b/src/st/meson.build
index 8004dfdbc18f5d16cb673448a4c2ace0a192c821..084fb2ee4e97b1ddf308f92b51e47698945ca6ff 100644 (file)
--- a/src/st/meson.build
+++ b/src/st/meson.build
@@ -180,7 +180,7 @@ st_cflags = [
 libst = shared_library('st-1.0',
   sources: st_gir_sources + st_nogir_sources + croco_sources,
   c_args: st_cflags,
-  dependencies: [clutter_dep, gmodule_dep, gtk_dep, mutter_dep, libxml_dep, m_dep],
+  dependencies: [clutter_dep, gtk_dep, mutter_dep, libxml_dep, m_dep],
   build_rpath: mutter_typelibdir,
   install_rpath: mutter_typelibdir,
   install_dir: pkglibdir,

diff --git a/src/st/st-viewport.c b/src/st/st-viewport.c
index 8aaaad54acf06bd2501b43808c696723a91f821b..96b703b14feaa985043d172a4b5915551be9e0bf 100644 (file)
--- a/src/st/st-viewport.c
+++ b/src/st/st-viewport.c
@@ -80,22 +80,8 @@ adjustment_value_notify_cb (StAdjustment *adjustment,
                             GParamSpec   *pspec,
                             StViewport   *viewport)
 {
-  static gboolean invalidate_paint_volume_valid = FALSE;
-  static void (* invalidate_paint_volume) (ClutterActor *) = NULL;
-
   clutter_actor_invalidate_transform (CLUTTER_ACTOR (viewport));
-
-  if (!invalidate_paint_volume_valid)
-    {
-      g_module_symbol (g_module_open (NULL, G_MODULE_BIND_LAZY),
-                       "clutter_actor_invalidate_paint_volume",
-                       (gpointer *)&invalidate_paint_volume);
-      invalidate_paint_volume_valid = TRUE;
-    }
-
-  if (invalidate_paint_volume)
-    invalidate_paint_volume (CLUTTER_ACTOR (viewport));
-
+  clutter_actor_invalidate_paint_volume (CLUTTER_ACTOR (viewport));
   clutter_actor_queue_relayout (CLUTTER_ACTOR (viewport));
 }
 

diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index 644b8e25af0536947a5d8e8f01632ad0bc45c91e..e2814e52ea3940450d79fb9d412a73ae32615b7a 100644 (file)
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -1732,19 +1732,7 @@ st_widget_recompute_style (StWidget    *widget,
 
   if (!paint_equal)
     {
-      static gboolean invalidate_paint_volume_valid = FALSE;
-      static void (* invalidate_paint_volume) (ClutterActor *) = NULL;
-
-      if (!invalidate_paint_volume_valid)
-        {
-          g_module_symbol (g_module_open (NULL, G_MODULE_BIND_LAZY),
-                           "clutter_actor_invalidate_paint_volume",
-                           (gpointer *)&invalidate_paint_volume);
-          invalidate_paint_volume_valid = TRUE;
-        }
-
-      if (invalidate_paint_volume)
-        invalidate_paint_volume (CLUTTER_ACTOR (widget));
+      clutter_actor_invalidate_paint_volume (CLUTTER_ACTOR (widget));
 
       next_paint_state (widget);